debian/copyright: update

diff --git a/debian/changelog b/debian/changelog
index 7d47d419075b23d345e2b394ac378ac3aa7128c3..5011dba8a752aee1ef20dcd18f8ee331d4b5fb5f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ostree (2016.4-1) UNRELEASED; urgency=medium
     - Remove all patches, applied upstream
     - debian/libostree-1-1.symbols: update for new versioned symbols
     - Build-depend on libmount-dev
+    - debian/copyright: update
   * debian/gbp.conf: use DEP-14 branch names
   * Fix ITP bug number in changelog (was #813308, should have been #697477)
 

diff --git a/debian/copyright b/debian/copyright
index 79fc55e14b4c687ed5b415a5f0607e1bfc0724fa..4b81b60f2ba9821afbc835d2d25cc584a2f5a948 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -50,6 +50,12 @@ Copyright:
  © 2012 Matthew Endsley
 License: BSD-2-clause
 
+Files:
+ contrib/golang/*
+Copyright:
+ © 2013 Conformal Systems LLC
+License: ISC
+
 Files: debian/*
 Copyright:
  © 2015 David King <amigadave@amigadave.com>
@@ -180,3 +186,16 @@ License: BSD-3-clause
  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: ISC
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.